fix document generation on fedora (#949)

* try to find common docbook url for fedora/ubuntu/homebrew catalogs.

* fedora builds

jing is broken on f32, remove it so it doesn't kill our document build.

add f37, with Qt5 because fedora doesn't have Qt6 webengine yet.

diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
index 79c38dd1433bc632c3a3a0b94cdd99e7e001e976..555e042edf5615c04e6d1226a04a18cf9ae6fbf2 100644 (file)
--- a/.github/workflows/fedora.yml
+++ b/.github/workflows/fedora.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         # version 32, though obsolete, uses Qt 5.14 so we keep it for that.
-        version: ['32', '35']
+        version: ['32', '35', '37']
     container:
       image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_f${{ matrix.version }}
       env:

diff --git a/tools/Dockerfile_f32 b/tools/Dockerfile_f32
index 87d96c4d82c1313050dfaa1dcbd46069a6379b3a..df78264e1890b3827e948fa1c7fa1fdd0d286fcf 100644 (file)
--- a/tools/Dockerfile_f32
+++ b/tools/Dockerfile_f32
@@ -16,7 +16,7 @@ RUN dnf install --assumeyes libusbx-devel zlib-devel shapelib-devel && \
 RUN dnf install --assumeyes qt5-qtbase-devel qt5-qtserialport-devel qt5-qtwebengine-devel qt5-linguist qt5-qttranslations && \
     dnf clean all
 # tools to build the docs
-RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop docbook5-style-xsl jing && \
+RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop docbook5-style-xsl docbook5-schemas && \
     dnf clean all
 # create a link as fedora uses the name qmake-qt5 for Qt5's qmake.
 RUN alternatives --install /usr/bin/qmake qt /usr/lib64/qt5/bin/qmake 100

diff --git a/tools/Dockerfile_f35 b/tools/Dockerfile_f35
index 1b0b05f58984b3ae3065ba1ff17722a594b47940..c3fdea90b08cc873340a14c5b865cb6d5242cf7c 100644 (file)
--- a/tools/Dockerfile_f35
+++ b/tools/Dockerfile_f35
@@ -16,7 +16,7 @@ RUN dnf install --assumeyes libusb1-devel zlib-devel shapelib-devel && \
 RUN dnf install --assumeyes qt5-qtbase-devel qt5-qtserialport-devel qt5-qtwebengine-devel qt5-linguist qt5-qttranslations && \
     dnf clean all
 # tools to build the docs
-RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop docbook5-style-xsl && \
+RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop docbook5-style-xsl docbook5-schemas && \
     dnf clean all
 # create a link as fedora uses the name qmake-qt5 for Qt5's qmake.
 RUN alternatives --install /usr/bin/qmake qt /usr/lib64/qt5/bin/qmake 100

diff --git a/tools/Dockerfile_f37 b/tools/Dockerfile_f37
new file mode 100644 (file)
index 0000000..dc90f8c
--- /dev/null
+++ b/tools/Dockerfile_f37
@@ -0,0 +1,22 @@
+# this file is used to build the image gpsbabel_build_environment used by travis.
+
+FROM fedora:37
+
+LABEL maintainer="https://github.com/tsteven4"
+
+WORKDIR /app
+
+# basic tools to build
+RUN dnf install --assumeyes git make valgrind diffutils findutils langpacks-en ninja-build && \
+    dnf clean all
+# libraries used by gpsbabel.  zlib and shapelib may or may not be used depending qmake options.
+RUN dnf install --assumeyes libusb1-devel zlib-devel shapelib-devel && \
+    dnf clean all
+# Qt used by gpsbabel, gpsbabelfe
+RUN dnf install --assumeyes qt5-qtbase-devel qt5-qtserialport-devel qt5-qtwebengine-devel qt5-linguist qt5-qttranslations && \
+    dnf clean all
+# tools to build the docs
+RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop docbook5-style-xsl docbook5-schemas && \
+    dnf clean all
+# create a link as fedora uses the name qmake-qt5 for Qt5's qmake.
+RUN alternatives --install /usr/bin/qmake qt /usr/lib64/qt5/bin/qmake 100

diff --git a/tools/make_gpsbabel_doc.sh b/tools/make_gpsbabel_doc.sh
index d639b7eeffe4f6621bfa7c5c647c644650dbb244..61b8dcb93da01e357b63340c52db6ae63d6c1586 100755 (executable)
--- a/tools/make_gpsbabel_doc.sh
+++ b/tools/make_gpsbabel_doc.sh
@@ -2,9 +2,9 @@
 set -ex
 
 perl xmldoc/makedoc
-xmllint --noout --relaxng http://www.oasis-open.org/docbook/xml/5.0/rng/docbook.rng xmldoc/readme.xml
+xmllint --noout --relaxng http://docbook.org/xml/5.0/rng/docbook.rng xmldoc/readme.xml
 # the following doesn't seem to work.
-#xmllint --noout --schematron http://www.oasis-open.org/docbook/xml/5.0/sch/docbook.sch xmldoc/readme.xml
+#xmllint --noout --schematron http://docbook.org/xml/5.0/sch/docbook.sch xmldoc/readme.xml
 # jing and many depedencies removed from fedora
 if command -v jing >/dev/null 2>&1; then
   jing http://docs.oasis-open.org/docbook/xml/5.0/rng/docbook.rng xmldoc/readme.xml